From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Wed, 1 Feb 2023 15:32:11 +0000 (-0300)
Subject: quickSettings: Remove null checks
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~405^2^2~25
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=055694de9df70f17bfa85786b8cbc5d8e2d2e793;p=gnome-shell.git

quickSettings: Remove null checks

The '_overlay' field is always set at construction to a valid actor,
so there's no need to protect against null here.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2624>
---

diff --git a/js/ui/quickSettings.js b/js/ui/quickSettings.js
index ef8d06e51..4868cf6b3 100644
--- a/js/ui/quickSettings.js
+++ b/js/ui/quickSettings.js
@@ -631,9 +631,7 @@ const QuickSettingsLayout = GObject.registerClass({
     vfunc_get_preferred_height(container, _forWidth) {
         const rows = this._getRows(container);
 
-        let [minHeight, natHeight] = this._overlay
-            ? this._overlay.get_preferred_height(-1)
-            : [0, 0];
+        let [minHeight, natHeight] = this._overlay.get_preferred_height(-1);
 
         const spacing = (rows.length - 1) * this.row_spacing;
         minHeight += spacing;
@@ -651,14 +649,12 @@ const QuickSettingsLayout = GObject.registerClass({
     vfunc_allocate(container, box) {
         const rows = this._getRows(container);
 
-        const [, overlayHeight] = this._overlay
-            ? this._overlay.get_preferred_height(-1)
-            : [0, 0];
+        const [, overlayHeight] = this._overlay.get_preferred_height(-1);
 
         const availWidth = box.get_width() - (this.nColumns - 1) * this.column_spacing;
         const childWidth = Math.floor(availWidth / this.nColumns);
 
-        this._overlay?.allocate_available_size(0, 0, box.get_width(), box.get_height());
+        this._overlay.allocate_available_size(0, 0, box.get_width(), box.get_height());
 
         const isRtl = container.text_direction === Clutter.TextDirection.RTL;